Merge "Remove unused test methods"