Reorganized window test, disabled save testing.