Fixes #4252, Fixes #3171 Fixed Codeception