Fixed tests
Fixed backwards compatibility import