improve 'for' tests