Added tests with coverage