Added type testing based on regexes