Some progress on unit testing the DAOs