adding tests
better support for multiple versions
adding more tests