re-organized tests for inconsistent type analysis
fixed bug in merging equivalent types