Fix broken tests.
Merge pull request #863 from jvale/fix_broken_tests

Fix broken tests.