cond: clean-up and start of tests

Change-Id: Ie7397bde5650f997c9d6abcc1040838b55fccedf