Import version that supports testing mail services