Removed more dependencies from POM and fixed bad import in unit test.