Fix failing test suite

Avoid committing commented out code.