fix import problems
fix failed tests

finally XD