Second batch of changing mixin to import in test codes.