Minor improvements to tests