added changes to zoo.py and zoo_tests.py