Fix two of the EntityVersionCleanupTest tests, there are still 4 error/failures in that test.