make the tests to match the big refactorization