Re-arrange tests and fix some warnings

Merge request reports

Loading