Completing Test - everything as expected
Merge branch 'development'