Remove tests that showed up during the rebase.