Bug 16624: Add regression tests