Remove tests backported that should not