More test separation