Fixed the python tests in the presence of muliple eggs.

Review: https://reviews.apache.org/r/16136