refactor out rolling in test suite