rewrites test fix 1 + versioning