refactoring activity tests