Added diamond to the test config
Merged hosts/instances etc into a single map