Narrow test's constraints, and add some spacing to DeferredBinding