Refactored multi-window tests, should help with travis