Fix test and make it wider scope