Fixed dependencies on engine test structure that changed in 6.4.0