Allow creating test systems with multiple supported architectures

Change-Id: I2403eaf3d1084c74bc705439c3dfde9e24aca509