Updated test results
Merge branch 'master' into develop