Ok, I'll take a look at moving the tests over.