Back port testing changes to 1.0.x