Update windowed confusion matrix to v2; Add unit tests for same