Engine: Fixed tests as per PR 3414