Update driver opts

Fix button test
Fix tests