Taking care of my tests was finished with some refactoring strategies to keep it as clean as our domain classes