Before even attempting to fix, it's time we got some tests for those animals. Some of them currently fail, as a consequence of the bug mentioned above.
