Bug 10515: add regression tests