Merge pull request #91 from daniellemayne/develop

Develop: test improvements