refactor of expectation handlers to not use block/super implementation