Add tests covering wiring (re #504)
Add better test coverage to the Conflicter module