Fix internal device tests