Creation of test module + updates to managment