Fixed a couple of unit tests to aid with the publish process