Add the tests back in