Increase unit test coverage to ~95%