Add some tests that were suggested by @arv