Update the test macro and driver as the master