Proposed IoT compose testing cleanups