Merge "Restore test assertions. Update default plugin imports. Fix sonar issues in...