Updated to 1.9 version, more tests pass than
1.2