refactored activity spec