Integration tests and next button logic

Added integration tests for add/remove windows and next button logic.