Add some regression tests for previous commit 0e23374