Adds comments and tests
Rewrites Spain validate old function