Change failure to semantic error
Merge branch 'tbm' into yz_1216
Cleanup tests
Merge branch 'yz_1216'