Fix tests throwing errors and ciruclar dependencies

Merge request reports

Loading