Improve unit test coverage

[pont-us]

Image building and container running code is hard to test efficiently, but we can do better than the current 70%.

[pont-us]

Up to 77% now :)

[pont-us]

Now over 80%., and codecov running on PRs should ensure that it doesn't drop. I think this is a reasonable baseline coverage, so closing as completed.