added execution context to fold, more tests