fixed various tests to reflect the changes in the modules