Revisit Tests

[redhatrises]

Mockery generates test code that creates duplicate code which is rather inefficient. This should be looked at and fixed. In addition, more tests need to be added/updated with the recent code additions/updates.