Small fixes to test versioning