updated testing suite and fixed bugs
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #5 from duncandc/develop

Develop