Fix constraint solver tests for f02314f66ed

Note that we now avoid adding usedRCs:undefined to the resolver return
value, since that makes tests annoying (especially since our display
drops undefined, ah well).