changing code for testbot hardware
merge error fixes