Added tests for private methods
Removed warnings
Use package importer