fixed imports, removed tests, fixed parent issues