Adding compartment tests