Improve post-test assertions