forgot to add unit tests back into the checkin
Merge pull request #595 from jay-hodgson/develop

forgot to add unit tests back into the checkin