Makes the change to RelatedActivityType #42

Fixes up the tests as well