Merge "Remove tests which do not test anything"