Add two more regression tests for #654

Based on feedback from @shino.