Further development to pass a few other test cases.