More minor test case improvements