Fix tests, proof errors
  Tim Van Steenburgh 2014-09-09 Fix tests, proof errors