Separate tests for #353 and #354