BUG-730 : added null checks to tests to increase branch coverage