Updated Engine, simplified code base; Updated RenderEngine and test to compensate.