placed changes to EngineTests.m2 from master branch in linalg-refactor version, and removed some header file includes