old tests removed
removed unnecessary imports