Some tests have been improved.
Unecessary line removed.
Merge branch 'ew-dev' into development