Fix test
Merge branch 'fix/unit-test' into 'master'
Set version to 1.6.1 in POM