Issue refs #1768: integrate new dao's to core dictionary controller, fix tests