Refined tests and improved descriptions