Added untested tests
Merge branch 'test4' into development