Merge "delete obsolete tests"