Fixed some tests and removed unused using statements