Improved Testing. Removed unused import