Fix tests. Add two more test cases