[MM][82868970] Getting tests to run and get cleaned