rework reconciler tests to be more declarative
merge