Add more driver and adaptor test coverage