Changes to align unit tests, docblocks, and modelled functionality