Merge pull request #18 from bpbond/master

Test code improvements