more testcases and started unify