Bug 17088: Add tests to cover the changes