Added fix for 2x defines in same subgraph

Hello jon, 

Please review the following commits I made in branch 'jeremy-fixes'.

0991f73a01a28a4b6aac8a8c56bcc7035218dc9c (2013-03-23 18:50:33 -0700)
Fixed animal test

f43bf80792b91464f337d7e13003d126c9493ff0 (2013-03-23 18:47:15 -0700)
Adding and fixing test for 2x defines

R=jon