Cleaned up Proof and ProofTest