added tests
Merge branch 'development' into test
Tests completed