Pet Profile - Cucumber test
Merged in petprofile1, fixed merge conflicts