Bug Fixed couple of tests added