Fixed test failures due to an uncommitted change (not yet ready to be committed)