refactor acitvity and activity_time to use factory girl