delete obsolete hourglass

and some misc test fixes.