Fix up test