Add new driving layer. Cleanup mock utils.