Merge "Fix test"