#22 Updated/Wrote Tests. Everything passed. Travis should stop bitching around ;) Issue should be completed with that.