diff --git a/gstlal-calibration/config_files/O2/H1/tests/H1DCS_AllCorrections_Cleaning.ini b/gstlal-calibration/config_files/O2/H1/tests/H1DCS_AllCorrections_Cleaning.ini
index 813b071ce36e7fd0b1ad67d002d09888d410f418..0c7d1ae18d26e3cf623b6b18b4adccd92335680e 100644
--- a/gstlal-calibration/config_files/O2/H1/tests/H1DCS_AllCorrections_Cleaning.ini
+++ b/gstlal-calibration/config_files/O2/H1/tests/H1DCS_AllCorrections_Cleaning.ini
@@ -39,7 +39,7 @@ NumBuffers: 10
 ###############################################
 # If writing to frame files use these options #
 ###############################################
-FrameType: H1DCS_TEST
+FrameType: H1DCS
 
 [CalibrationConfigurations]
 IFO: H1
diff --git a/gstlal-calibration/config_files/PreER13/H1/C00/H1GDS_FRAMES_1225558818.ini b/gstlal-calibration/config_files/PreER13/H1/C00/H1GDS_FRAMES_1225558818.ini
index 8775db4375bb611bc6883cf4f15915a3f37e0968..c383fd050524dccb8cdea9947f783c39769597e4 100644
--- a/gstlal-calibration/config_files/PreER13/H1/C00/H1GDS_FRAMES_1225558818.ini
+++ b/gstlal-calibration/config_files/PreER13/H1/C00/H1GDS_FRAMES_1225558818.ini
@@ -73,30 +73,30 @@ ApplyKappaPUM: No
 # Set this to have the \kappa_p factors the actuation chain with an adaptive filter that corrects for both magnitude and phase errors.
 ApplyComplexKappaPUM: Yes
 
-ComputeKappaUIM: Yes
+ComputeKappaUIM: No
 ApplyKappaUIM: No
 # Set this to have the \kappa_u factors the actuation chain with an adaptive filter that corrects for both magnitude and phase errors.
-ApplyComplexKappaUIM: Yes
+ApplyComplexKappaUIM: No
 
 # Set this to use a calibration line injected using the UIM stage of actuation to compute \kappa_U. Otherwise, the DARM_ctrl line is used.
 UseUIMLine: Yes
 
-ComputeKappaC: Yes
-ApplyKappaC: Yes
+ComputeKappaC: No
+ApplyKappaC: No
 
-ComputeFcc: Yes
-ApplyFcc: Yes
+ComputeFcc: No
+ApplyFcc: No
 
-ComputeSRCQ: Yes
-ApplySRCQ: Yes
+ComputeSRCQ: No
+ApplySRCQ: No
 
-ComputeFs: Yes
-ApplyFs: Yes
+ComputeFs: No
+ApplyFs: No
 
 ###########################################
 # Options related to the coherence gating #
 ###########################################
-UseCoherence: Yes
+UseCoherence: No
 CoherenceUncThreshold: 0.004
 # Amount of time used in front-end to compute coherence
 CoherenceTime: 130
diff --git a/gstlal-calibration/gst/lal/gstlal_adaptivefirfilt.c b/gstlal-calibration/gst/lal/gstlal_adaptivefirfilt.c
index 2a23c7c099311aca5ebf2ec701595bfc5dc5280d..0e1d9b296792b7266401ee30d8b66255558a7738 100644
--- a/gstlal-calibration/gst/lal/gstlal_adaptivefirfilt.c
+++ b/gstlal-calibration/gst/lal/gstlal_adaptivefirfilt.c
@@ -586,7 +586,7 @@ static gboolean set_caps(GstBaseSink *sink, GstCaps *caps) {
 
 		gint64 fd_variable_filter_length = element->variable_filter_length / 2 + 1;
 		element->variable_filter = (complex double *) fftw_malloc(fd_variable_filter_length * sizeof(*element->variable_filter));
-		element->variable_filter_plan = fftw_plan_dft_c2r_1d(element->variable_filter_length, element->variable_filter, (double *) element->variable_filter, FFTW_MEASURE);
+		element->variable_filter_plan = fftw_plan_dft_c2r_1d(element->variable_filter_length, element->variable_filter, (double *) element->variable_filter, FFTW_ESTIMATE);
 
 		GST_LOG_OBJECT(element, "FFTW planning complete");
 
diff --git a/gstlal-calibration/gst/lal/gstlal_complexfirbank.c b/gstlal-calibration/gst/lal/gstlal_complexfirbank.c
index 20b22713573c160eb690e6a0001f762f7ccb080d..e560e21cf6e7ccd5672169d29fece3228639b227 100644
--- a/gstlal-calibration/gst/lal/gstlal_complexfirbank.c
+++ b/gstlal-calibration/gst/lal/gstlal_complexfirbank.c
@@ -379,14 +379,14 @@ static int create_fdd_workspace(GSTLALComplexFIRBank *element)
 
 	GST_LOG_OBJECT(element, "starting FFTW planning");
 	element->workspace.fdd.input = (complex double *) fftw_malloc(length_fd * sizeof(*element->workspace.fdd.input));
-	element->workspace.fdd.in_plan = fftw_plan_dft_r2c_1d(fft_block_length(element), (double *) element->workspace.fdd.input, element->workspace.fdd.input, FFTW_MEASURE);
+	element->workspace.fdd.in_plan = fftw_plan_dft_r2c_1d(fft_block_length(element), (double *) element->workspace.fdd.input, element->workspace.fdd.input, FFTW_ESTIMATE);
 
 	/*
 	 * frequency-domain workspace
 	 */
 
 	element->workspace.fdd.filtered = (complex double *) fftw_malloc(length_fd * sizeof(*element->workspace.fdd.filtered));
-	element->workspace.fdd.out_plan = fftw_plan_dft_c2r_1d(fft_block_length(element), element->workspace.fdd.filtered, (double *) element->workspace.fdd.filtered, FFTW_MEASURE);
+	element->workspace.fdd.out_plan = fftw_plan_dft_c2r_1d(fft_block_length(element), element->workspace.fdd.filtered, (double *) element->workspace.fdd.filtered, FFTW_ESTIMATE);
 	GST_LOG_OBJECT(element, "FFTW planning complete");
 
 	/*
@@ -451,14 +451,14 @@ static int create_fds_workspace(GSTLALComplexFIRBank *element)
 
 	GST_LOG_OBJECT(element, "starting FFTW planning");
 	element->workspace.fds.input = (complex float *) fftwf_malloc(length_fd * sizeof(*element->workspace.fds.input));
-	element->workspace.fds.in_plan = fftwf_plan_dft_r2c_1d(fft_block_length(element), (float *) element->workspace.fds.input, element->workspace.fds.input, FFTW_MEASURE);
+	element->workspace.fds.in_plan = fftwf_plan_dft_r2c_1d(fft_block_length(element), (float *) element->workspace.fds.input, element->workspace.fds.input, FFTW_ESTIMATE);
 
 	/*
 	 * frequency-domain workspace
 	 */
 
 	element->workspace.fds.filtered = (complex float *) fftwf_malloc(length_fd * sizeof(*element->workspace.fds.filtered));
-	element->workspace.fds.out_plan = fftwf_plan_dft_c2r_1d(fft_block_length(element), element->workspace.fds.filtered, (float *) element->workspace.fds.filtered, FFTW_MEASURE);
+	element->workspace.fds.out_plan = fftwf_plan_dft_c2r_1d(fft_block_length(element), element->workspace.fds.filtered, (float *) element->workspace.fds.filtered, FFTW_ESTIMATE);
 	GST_LOG_OBJECT(element, "FFTW planning complete");
 
 	/*
diff --git a/gstlal-calibration/gst/lal/gstlal_transferfunction.c b/gstlal-calibration/gst/lal/gstlal_transferfunction.c
index 9a198971ac44b5e7f164c79e9a2fbd1bfa90ca5f..5f60fa2cfc7cc9efd4a8e4776889a6c96b457e1c 100644
--- a/gstlal-calibration/gst/lal/gstlal_transferfunction.c
+++ b/gstlal-calibration/gst/lal/gstlal_transferfunction.c
@@ -1502,13 +1502,13 @@ static gboolean set_caps(GstBaseSink *sink, GstCaps *caps) {
 
 		/* data that will be Fourier transformed into frequency domain */
 		element->workspace.wspf.fft = (complex float *) fftwf_malloc(fd_fft_length * sizeof(*element->workspace.wspf.fft));
-		element->workspace.wspf.plan = fftwf_plan_dft_r2c_1d(element->fft_length, (float *) element->workspace.wspf.fft, element->workspace.wspf.fft, FFTW_MEASURE);
+		element->workspace.wspf.plan = fftwf_plan_dft_r2c_1d(element->fft_length, (float *) element->workspace.wspf.fft, element->workspace.wspf.fft, FFTW_ESTIMATE);
 
 		if(element->make_fir_filters && !element->workspace.wspf.fir_filter) {
 
 			/* data that will be inverse Fourier transformed back into the time domain */
 			element->workspace.wspf.fir_filter = (complex float *) fftwf_malloc(fd_fir_length * sizeof(*element->workspace.wspf.fir_filter));
-			element->workspace.wspf.fir_plan = fftwf_plan_dft_c2r_1d(element->fir_length, element->workspace.wspf.fir_filter, (float *) element->workspace.wspf.fir_filter, FFTW_MEASURE);
+			element->workspace.wspf.fir_plan = fftwf_plan_dft_c2r_1d(element->fir_length, element->workspace.wspf.fir_filter, (float *) element->workspace.wspf.fir_filter, FFTW_ESTIMATE);
 		}
 		GST_LOG_OBJECT(element, "FFTWF planning complete");
 
@@ -1684,13 +1684,13 @@ static gboolean set_caps(GstBaseSink *sink, GstCaps *caps) {
 
 		/* data that will be Fourier transformed into frequency domain */
 		element->workspace.wdpf.fft = (complex double *) fftw_malloc(fd_fft_length * sizeof(*element->workspace.wdpf.fft));
-		element->workspace.wdpf.plan = fftw_plan_dft_r2c_1d(element->fft_length, (double *) element->workspace.wdpf.fft, element->workspace.wdpf.fft, FFTW_MEASURE);
+		element->workspace.wdpf.plan = fftw_plan_dft_r2c_1d(element->fft_length, (double *) element->workspace.wdpf.fft, element->workspace.wdpf.fft, FFTW_ESTIMATE);
 
 		if(element->make_fir_filters && !element->workspace.wdpf.fir_filter) {
 
 			/* data that will be inverse Fourier transformed back into the time domain */
 			element->workspace.wdpf.fir_filter = (complex double *) fftw_malloc(fd_fir_length * sizeof(*element->workspace.wdpf.fir_filter));
-			element->workspace.wdpf.fir_plan = fftw_plan_dft_c2r_1d(element->fir_length, element->workspace.wdpf.fir_filter, (double *) element->workspace.wdpf.fir_filter, FFTW_MEASURE);
+			element->workspace.wdpf.fir_plan = fftw_plan_dft_c2r_1d(element->fir_length, element->workspace.wdpf.fir_filter, (double *) element->workspace.wdpf.fir_filter, FFTW_ESTIMATE);
 		}
 		GST_LOG_OBJECT(element, "FFTW planning complete");
 
diff --git a/gstlal-calibration/tests/check_calibration/Makefile b/gstlal-calibration/tests/check_calibration/Makefile
index c6a2ad974d538e70206a92a85ccc701c05b8d5a5..89fb945984c67b3484c5521df697d73c79c107bb 100644
--- a/gstlal-calibration/tests/check_calibration/Makefile
+++ b/gstlal-calibration/tests/check_calibration/Makefile
@@ -8,21 +8,21 @@ IFO = H
 # determines where to look for filters files (e.g., O1, O2, O3, ER10, ER13, ER14, PreER10, PreER13, PreER14)
 OBSRUN = O2
 
-START = 1225519232
-END = 1225520256
+START = 1186944000
+END = 1186944512
 SHMRUNTIME = 400
 # How much time does the calibration need to settle at the start and end?
 PLOT_WARMUP_TIME = 300
 PLOT_COOLDOWN_TIME = 64
 
 GDSCONFIGS = ../../config_files/PreER13/H1/C00/H1GDS_FRAMES_1225558818.ini
-DCSCONFIGS = ../../config_files/O2/H1/tests/H1DCS_FreqIndepCorrections_Cleaning.ini
+DCSCONFIGS = ../../config_files/O2/H1/tests/H1DCS_AllCorrections_Cleaning.ini
 DCSFCCCONFIGS = ../../config_files/O2/H1/tests/H1DCS_FreqIndepAndFccCorrections_Cleaning.ini
 GDSTESTCONFIGS = ../../config_files/PreER13/H1/H1GDS_TEST_1225558818.ini
 DCSTESTCONFIGS = ../../config_files/O2/H1/tests/H1DCS_AllCorrections_Cleaning.ini
 GDSSHMCONFIGS = ../../config_files/PreER13/H1/tests/H1GDS_1222058826_shm2frames.ini
 
-all: GDS_over_CALCS
+all: $(IFO)1_hoft_DCS_frames.cache
 
 ###############################################
 ### These commands should change less often ###
@@ -51,20 +51,20 @@ $(IFO)1_C02_frames.cache:
 
 $(IFO)1_hoft_GDS_frames.cache: $(IFO)1_easy_raw_frames.cache filters framesdir
 	GST_DEBUG=3 gstlal_compute_strain --gps-start-time $(START) --gps-end-time $(END) --frame-cache $(IFO)1_easy_raw_frames.cache --output-path Frames/$(OBSRUN)/$(IFO)1/GDS/ --frame-duration=64 --frames-per-file=1 --wings=0 --config-file $(GDSCONFIGS)
-	ls Frames/$(OBSRUN)/$(IFO)1/GDS/$(IFO)-$(IFO)1GDS_TEST*.gwf | lalapps_path2cache > $@
+	ls Frames/$(OBSRUN)/$(IFO)1/GDS/$(IFO)-$(IFO)1GDS-*.gwf | lalapps_path2cache > $@
 
 $(IFO)1_hoft_DCS_frames.cache: $(IFO)1_easy_raw_frames.cache filters framesdir
 	GST_DEBUG=3 gstlal_compute_strain --gps-start-time $(START) --gps-end-time $(END) --frame-cache $(IFO)1_easy_raw_frames.cache --output-path Frames/$(OBSRUN)/$(IFO)1/DCS/ --frame-duration=64 --frames-per-file=1 --wings=0 --config-file $(DCSCONFIGS)
-	ls Frames/$(OBSRUN)/$(IFO)1/DCS/$(IFO)-$(IFO)1DCS*.gwf | lalapps_path2cache > $@
+	ls Frames/$(OBSRUN)/$(IFO)1/DCS/$(IFO)-$(IFO)1DCS-*.gwf | lalapps_path2cache > $@
 
 # In case we want to compare one calibration to another...
 $(IFO)1_hoft_GDS_TEST_frames.cache: $(IFO)1_easy_raw_frames.cache filters framesdir
 	GST_DEBUG=3 gstlal_compute_strain --gps-start-time $(START) --gps-end-time $(END) --frame-cache $(IFO)1_easy_raw_frames.cache --output-path Frames/$(OBSRUN)/$(IFO)1/GDS/ --frame-duration=64 --frames-per-file=1 --wings=0 --config-file $(GDSTESTCONFIGS)
-	ls Frames/$(OBSRUN)/$(IFO)1/GDS/$(IFO)-$(IFO)1GDS_TEST*.gwf | lalapps_path2cache > $@
+	ls Frames/$(OBSRUN)/$(IFO)1/GDS/$(IFO)-$(IFO)1GDS_TEST-*.gwf | lalapps_path2cache > $@
 
 $(IFO)1_hoft_DCS_TEST_frames.cache: $(IFO)1_easy_raw_frames.cache filters framesdir
 	GST_DEBUG=3 gstlal_compute_strain --gps-start-time $(START) --gps-end-time $(END) --frame-cache $(IFO)1_easy_raw_frames.cache --output-path Frames/$(OBSRUN)/$(IFO)1/DCS/ --frame-duration=64 --frames-per-file=1 --wings=0 --config-file $(DCSTESTCONFIGS)
-	ls Frames/$(OBSRUN)/$(IFO)1/DCS/$(IFO)-$(IFO)1DCS_TEST*.gwf | lalapps_path2cache > $@
+	ls Frames/$(OBSRUN)/$(IFO)1/DCS/$(IFO)-$(IFO)1DCS_TEST-*.gwf | lalapps_path2cache > $@
 
 $(IFO)1_hoft_DCS_FCC_frames.cache: $(IFO)1_easy_raw_frames.cache filters framesdir
 	GST_DEBUG=3 gstlal_compute_strain --gps-start-time $(START) --gps-end-time $(END) --frame-cache $(IFO)1_easy_raw_frames.cache --output-path Frames/$(OBSRUN)/$(IFO)1/DCS/ --frame-duration=64 --frames-per-file=1 --wings=0 --config-file $(DCSFCCCONFIGS)