order capturing, email and integration tests added