Rename DAOs and fix tests
Fix home page tests