Fixing up test specs