Add unit tests for 100% coverage