Fix dismax tests.
Merge pull request #488 from rywall/edismax

Fix dismax tests that were broken in #487.