Fixed import error
Fixed some tests