Adding REGEX and starting tests