Added logic to build list of expectations based on authentication scenario steps