fixes for tests.
Merge pull request #11 from ericlewis/master

Fix for tests.