change configure handle to device handle
change test case accordingly