Fix unit tests.
Merge pull request #79 from eucalyptus/fix_tests

Fix failing tests.