Updates from review

Additional tests for more scenarios
Better logging for reconciliation algorithm
Cleanup of spec test