fixed imports for pre 9.3 versions
run tests for 9.2 as well