Change script/test behavior a bit to accomodate CI