more testcases, engine fixed