more bug fixes
adding another test demo case.