Unify with new PL RSpec format