Refactored and fixed a bug that was stopping non-sharded tests to fail...