Updated test eggs.
Fixed conflicts.