Adding compartment tests

], done)