Small improvement and add more tests.
Fix failing test due to updated dep.