Fix current tests
Add version specific tests