Updates to test drivers