refactoring all tests after major development changes