Test things a bit more rigorously