fixed the moving of include files, so that there are not more errors of missing delegates. updated IM_Test with latest