restored/deprecated existing head/tail; fixed test idiocy