Add test block factory and a few more required block tests. Naming / comment tweaks from code review.