Add the tests again