modified test loader