fix unit tests

2 jobs for !437 with fix-opa in 93 minutes and 52 seconds
merge request