Adding compartment tests

in the waterfall ;)