gh-133 Additional unit test work