Fixing and Testing bird and bird group DAOs