updates and making the test work
Merge pull request #25 from SGover/shahar

updates and making the test work