minor test code cleanup
added more verbs and renamed activity classes
added more verbs and renamed activity classes