Fixed deployment scripts for test beds

Change-Id: Iffadf016add547d4cd6369d445334384d1d57caa