Enhance some tests