Adding Foundation.h to classes and fix the tests