Refactored 'test' directory
Added activity tests