Tweaked unit tests (per suggestions by dsdale)