some cleanups to the `test` and `should` method tests

Just cleaning things up a bit and removing some duplication.