Merge "Fix tests."