fixed #53
fixed #54

fixes #53
fixed 55
Testcase updates