More test revamping.