Cleaning up some tests
Fix filtering output file from list of modules