refactor punter tests for readability