Add more input validation
Remove extra links in test
Merge pull request #276 from krazemon/input-validation

Add more input validation