new test cases
fix one bug in parsing