Removed unneeded import
Removed tests