fixed the tests that broke during the refactor