Swaped some init values of animal so it can be more intuitive to create
Fixed tests so they work