Fixes in tests; CR: DF