more cleanup
added test fix commit from nicolas, missed to fetch org
Merge pull request #89 from exside/master

More cleanup + reintegrated test fix from nicolas after missed fetch