Task delete
More tests and cleanup
Email spec preparation
Merge remote-tracking branch 'origin/Integrationtest' into develop