FT-304 Move the blocktable into its own class, fix tests.