fixing regex and adding downcase tests