Minor changes in tests

I didn't see Jeff's comments and accidentally  merge the previous PR. Sorry for that :( .
@jmyounker @peterbourgon