Andy: Update the test case for #147.
Andy: Restore the test case for #147.