Few improvements, does change the API so bumped version.
Couple more tests.
Small test fix.