Data callback now matches node default style of cb(err, data). Tests updated to match.