Improve test