Some more tests for #354