Test improvements + test for RFE (one-offs rollback in arbitrary order)