Update watch task
Clean-up test imports
Fix integration tests