Partial and not-yet-working changes to accomodate the decoupled tests