US533 - Add form, unit and integration tests
US533 - Fix issues with integration tests and fix bug
Merge branch 'development' into development-work