Fixed test scripts.
Removed device key word.