Fixed test and recommitted previously lost changes.