More unittest fixes

Continuation of PR #16, some more fixes and unittests, in particular for Filesystem