Fix for Tests of Fix for Bug#1200228