Bug fix #32, also unit tests around this feature in base-driver