Extend repo's removeByTypeAndData to support optional status.

Plus adding tests for this method.