Merge "Take domain_id from config in some tests."