More refinements and test alterations