US632 - start to implement functional test for new self-employment section
Merge branch 'development' into development-work
US632 - fix bug where error label was not changing appropriately