follow_up tests completed except for assigned_user
Merging followup branch