fixed a couple of tests which broke after async upgrade