Tests updated
Merge branch 'feature/1083-test' into develop