Improve test commands