Fixed unit tests after introduction of WINDOW clause