Cleaned up some DAO generic inheritance. More tests.