Increase test coverage

Specifically the amount of unit testing we can do (ie, not requiring any external / network resources)