Working on unit tests for 100% coverage