GH #258 - More tests.