Adding and fixing test for 2x defines
Fixed animal test
1.6.1
Merge pull request #30 from Obvious/jeremy-fixes

Added fix for 2x defines in same subgraph