US533 - Added functional tests
Merge branch 'development' into development-work