Impove the test