updated tests + closing #13
Merge branch 'master' of github.com:flams/olives
fixed tests