neba-17 Increase the unit test coverage > 90%