Clean up Claim/Statement Test

This is a small bit of refactoring and clean up (zero functional changes, as far as I'm aware of) split from #306.