done refactoring in the tests.