Ongoing work to improve the unit tests

* Broader use of rubocop
* Numerous unit test changes
* Fixed an incorrect slot conflict error