Adding compartment tests

in waterfall