Fix the tests to match the new structure