Remove dependencies and update tests

Closes #3601844

Merge request reports

Loading