Updated the test driver and got some stuff working