Merge "Fix tests"