Author:David Ghabuzian
Added test cases that are making some tests.