Fixing some error in the drivers and a test

Looks like the unit tests got turned off. :(