Tests and small regex update