Created by: helinwang

Build and tests work as expected (120 tests rather than 215 test when WITH_FLUID_ONLY is turned on).