Improve test: guard