[#1117] Move some test comments into asserts

This makes the output when tests fail more useful

Unfortunately I don't see how to do this with assert_raises.