Corrected the import order
Fixed a load of tests