improve the way we add Instance nodes to suite xml

- pull out Instance objects as constants
- make adding <instance>s more declarative
- and guard against adding the same instance twice