Fix merging error that caused tests to fail