Merge "Remove tests"