Added most of the test | everything working | Coverage 59% , 82%