Improve test assertions