Refactoring to try and get tests working as expected