CLC-1515 Test activity type returns (still missing Notifications)

Pretty toned down from the original description of https://jira.media.berkeley.edu/jira/browse/CLC-1515