Add trailing colon
Rm reference to obsolete method
Pass all unit tests