A few small tweaks based on feedback

Formatted lines that were very long.
Removed a full qualification and used an import instead.
And then fixed a couple tests that were not testing the right things, or
were not setting up for failure at all.