updated tests
Merge pull request #107 from EDiLD/dev_fresh

updated tests