Remove the outdated tests, stub the new ones