Clean up loaded modules in tests
Use namespace::autoclean
Merge remote-tracking branch 'origin/master'