Lot of refactoring. Changed behaviour after saving animal.
Added Cucumber stuff.