Small refactor with one more test and some new examples for README