created Ellipse unit test source file
Merge from David
cleanup
Merge remote-tracking branch 'origin/DavidWin' into Joe
Ellipse update
merge from joe