Modified test calsses for BC/MST for eval