added expectations; renamed function
reverted prior accidental commit