refactoring tests in advance of adding typed tests