Fixing obsolete tests