MAJOR: generic DAO created, tests adjusted