static Block type comparison tests

static Block type comparison tests and other fixes