Refactored common definitions; added test_followup

Adds test cases for followup actions