Update unit tests for non covered classes