Added TestSuite and a few more tests. Coverage - 57.7%