Re-worked BareMetalInstance and VirtualServer ordering with unit test to ensure their templates are constructed properly.