More tests for #17.