Modified the test files that work with a moving window as well