Improvements to tests

- Bound arbitrary tree depth to 32.

- Test the if statement against arbitrary nouns.