Tests have been improved.
Merge branch 'development' into ew-dev
Merge branch 'ew-dev' into development