Resolve #3467694 "Run tests"
Closes #3467694
Temporarily, the MR contains changes from https://github.com/Gizra/og/commit/c6a95aac5c3599207e3fe750610a285d59cf3018 commit because the GitHub repo is ahead with this commit.
Edited by Claudiu Cristea