Improved test. Fixed versioning