Clean up imports
Use the unittest module
More test coverage