Simplified import for different Python versions
Added some basic tests
Merge branch 'tests'