Adding the conditional necessary to construct the right  options for both PV and HVM images. Also adding a test to make sure it is doing the right thing