fix broken tests and update chapters to match

Review URL: https://chromiumcodereview.appspot.com/12915005