Extended auto- and cross-correlation functions (and added one test)