Fix post-test bug, better messages