Fixed import.
Fixed warning, added unit test.