Added RemoveBySecondaryKey function and unit tests.