Finish importing  and fixing all tests