Refactor tests
Bump to version 1.1.1
Merge branch 'bugfix'