Fixing CS violations
Fixing unit test error, where "do...while" trailing error wasn't found