Fixing the tests to follow the new structure.