regular expressions fixed, check whole string
tests added