Merge pull request #368 from adamretter/develop

Test improvements and modernisation