Add a simple test case
Merged bug25822 into stable
Merged stable into default