Refactor test data
New Activity service test added