2 tests are refactored