Fixed regex and int matching
More yaml tests