- Add data-testid to a few elements for testing
- Convert tests to use VTU and re-organize some of them
to have better structure.