Tweaks to lifecycle testing module