notice fix
fix test for activity
Merge pull request #535 from yashodha/activity-migration

Activity migration