reverting test fixes + versioning