Small improvements to test-cases