Bringing back orientation picking tests