Streamlining some of the driver API calls and fixing failing tests.