Fix tests broken in 680a0c8.
Merge pull request #271 from simi/fix-tests

Fix tests broken in 680a0c8.