Take two on the test refactor