re #9 - add more tests