General ojs dao

Final tests for DAO