Fix tests #6804

Merged
merged 2 commits into from Jan 19, 2013