Fix some issues and add some tests for other drivers.
Fix space