most tests fixed
Merge pull request #91 from chennan47/develop

 most tests fixed