Activity cluster

Update models and tests for activity, activity cluster, and route