Added some tests
Merge branch 'master' into production