Cleanup fs test configuration

Cleanup fs test configuration.
* Use builder pattern to construct test configurations.
* Fix some failling due to problem comparing long with JUnit.

Some tests continue to fail but it is real failure and i will continue to investigate these failures.