Fixed some old imports
Fixed method tests