Split preparing and testing into different tasks