+ Fix up a few resulting errors
+ Revise DAO interface
Fix up remainder of the tests