tests are refactored