Relax some implicit assumptions in test-cases