bug fix for correlator API and updates to unit tests