update all tests for the refactor