Merge "Remove unused variable and tidy test #includes."