Merge pull request #1 from twekberg/master

Added some test cases.
Removed a duplicate test

Signed-off-by: Joshua Kugler <joshua@azariah.com>