Added TC, fixed breaking modulelist. Few smaller fixes