refactore tests and some helper methods

Merge request reports

Loading