Merge "Remove placeholder tests"