Added Zoo class + tests