Changes to device suite for failed test cases