Demo class completed, mockito features added to unit tests