tidy up and unit test additions
Merge branch 'LiamWebappUpdate' into development
unit test stuff