Fixing up test a bit