Removed unnecessary class.
Moved drivers to the test sources.
Merge branch 'feature/cleanup' into develop