SDV-213 Some unit test coverage