Setup for unit testing
Merge branch 'master' into development