US632 - increase test coverage and fix issues
US632 - Added started and finished employment scenario
Merge branch 'development' into development-work