ARGO-349: enhance reindex so that errors are logged, update unit tests to test logging cases (and re-arrange existing reindex unit test for readability)