Refs #7456 - Fix rubocop warnings and add more tests
Refs #7456 - Temporary fix to integration tests pending tests for the nic modal

To be removed once the modal integration tests are written