Updated TestUtil for more than 1 file, bs and rep