Get rid of location on Images - that causes problems due them being globally scoped while hardware is per-zone.
Rework tags in instances - both parsing and setting.
Define some basic stuff for templates in tests - that may actually be superfluous.