Added some more tests in the moving window version