Updated with a few additional tests.  Let me know if they don't address the test case you were looking for.