Everything nice and shiny for test deployment

Change-Id: I94b13fabe34148a9ae2a1c55db7e28b9b707385f