Bug 18999: Add regression tests