Refactor tests, add new cases fue to issues #2 and #3
update validation regex that fixes #3
Update tests due to issues #2 and #3