Fix obsolete tests