Assert things in specs

These tests pass, but there are still some assertions that are
incorrect. Fixes to come in following commits.

Follow-up to af8f9a7bffa238db2648dfc28f23b7618f6881f2