Fixing the codenarc test issues