Imports optimised in some tests