Fix errors in tests
Merge branch 'master' of github.com:AlexanderTankov/Zoo-Problem

Conflicts:
	animal.py