continues work on tests
Merge branch 'master' of https://github.com/rgrannell1/bismuth