Cleaned up build console output, and added some small unit tests
Just looking through the coverage result, and found a few small things we could improve on the code coverage.