Fix failing test.
Merge branch 'master' of git://github.com/AnalyticalGraphicsInc/cesium into issue1082
Changes after more review