Move some general utility things to test utils
Make a mock logger that will make sure no extra methods can get called, and that should make testing logging a little easlier