re-organise import in functional test module to reduce diff