Fix the enum test
Fix block type define.