Update outdated code

manlirequested to merge
github/fork/Bobholamovic/master into master

Created by: Bobholamovic

Fix known bugs and refactor the framework.

Merge request reports