Control now built after dots. Also, made the unit tests self contained regarding base dou files