Utilities file and refactor....
Fix current tests