move validation to main testing loop - ensures cleanup on failure
Merge pull request #26 from anodelman/do-cleanup

move validation to main testing loop - ensures cleanup on failure