Fix circular require warning in tests