Fixed test cases, travis/jenkins are a bit more unreliable sometimes.
Merged pull request #694