Added several tests
FIX - Added tests
Merge pull request #1 from camabeh/master

Added several tests