Fixing tests, fixing version