Clean up block creation and id generation
Clean up mocking of entry_points