Improve test coverage and fix bug found by tests.

Spell receive the same way all the time so things work.