Moved integration tests back to the tests directory and tidied gulp scripts.