Cleanup fs test configuration using builder pattern and fix some failling due to problem comparing long with junit.
Merge branch 'master' into fs_test
Merge pull request #7 from flesire/fs_test

Cleanup fs test configuration