New figures of merit for non-modal test-analysis correlation