refactored rollcall and created test class