all activity unit and acceptance tests now passing