use expected structure for tests
fix all the tests