FIX BROKEN UNIT TEST
Merge pull request #653 from rmansoor/master

FIX BROKEN UNIT TEST