Tests have now been fixed from refactoring direction