Commented out code

[JHertz5]

I've found commented-out code in a few testing files.

[JHertz5]

I've raised PR #1519 to resolve this issue.