Removed unused import.
Added more tests