Test cleanup for 0.22

This should clean up a couple items in the tests that are failing that came out of discussions in #165 and #166.