Minor container test case improvements