Fixed some unittest failures caused by changes to default references.