Added more Test cases
Fixed Previous Commit

Added closing the window