Minor changes to improve test