Fix illegal forward references in test suite.
Merge pull request #33 from cgay/tests

Fix illegal forward references in test suite.