Made test main and updated development tests.
Merge branch 'master' into developments