several AnimalDb updates, bugfixes and test fixes