Fixed remaining codenarc errors and turn on failOnError for codenarc
Fixed up tests that got lost in the merge