Better tests for #534