Some style mods.
Refactored a test.
Failing test was just not up-to-date.