Setting up first test
Merge branch 'master' into testing
Update tests