compoundify & cleanup tests