#1008 Test fix