worked on activities
worked on activities controller and test