Fix Rename bug due on entity/time clashes

My bad. :(
I am not yet, but if you look at the create repo spec, it is tagging s3 tests, we can probably start tagging specific cases as slow or mr etc... and conditionally running them in the same way.