Tests pulled out to optimise running