Further fixes to the nightly test cases