Lots of work on the test blockset so it looks halfway decent.