Refactor tests again to remove duplication in the code (DRY++). Figure out how to test helpers