Import Utility tests and refactor