Updated tests

And fixed the whole time machine problem