Testsuite cleanups

I fixed the block tests and a bug I discovered in the swarm tests.