modify Modules delegates & rm test code