Fix up a couple of tests
Merge pull request #33 from rmtmckenzie/Morgan

Fix up a couple of tests