Merge "remove deprecated tests"