Added animal_builder and tests