Further unit test additions and tidying of code fragments (e.g. sealing classes, etc)