KNOX-250 - Added some mocking and logging