Add more unit tests and max out code coverage