Readded TestEngine.h and shapestest.cpp