STYLE: Clean up the code
STYLE: Clean up ClientNormalOperationTest.