did tests refactoring