Minor test fixes to work under all cases.