Merge "Remove obsolete tests"