Change DocTest to conform with updated specs

Updated specs are described in http://git.io/o_ccxQ