more tests, let wpcf7 do the parsing
refactor & test both methods