Merge pull request #127 from nperrier/master

Fix indexer tests.