More refinements on test