Update tests to remove the obsolete ones.