finally fixed tests, protip dont move them to another folder.
tidied up imports