Improve  test