Hmmmn... though I might have fixed those two failing specs, but alas, not yet.  Still, refactoring!
Hmmmn... though I might have fixed those two failing specs, but alas, not yet.  Still, refactoring!

kidaa/eol,DanielZhangQingLong/eol4,kidaa/eol,kidaa/eol,DanielZhangQingLong/eol4,DanielZhangQingLong/eol4,kidaa/eol,DanielZhangQingLong/eol4,DanielZhangQingLong/eol4