Fixed test compositon after land of bug 960866