Cleanup fs test configuration using builder pattern and fix some failling due to problem comparing long with junit.