Schedule function updates

For more test coverage of what I could imagine will be a semi-common code path.