Cal &  Sam: Fix device tests.