Improve test errors