minor test-cases fixes