More tests. Removed unused import.