fixed some CodeNarc violations
removed commented out and dead code
reverted CodeNarc fix which altered the semantics of two tests