Bug fix.  Add more test cases