Adapted launchpad and also the rm_fault and resource_request tests. Issue #2407
Issue #2398
Issue #2339