Update tests to handle things not being removed.