Ha devel

Please review these changes before we merge into master. We will have to be extra careful with the drivers as I think some changes are incompatible with the way they are being used in other test cases