some testing and minor refactoring in ActivitiesController#milestone in preparation for future changes