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