Added tests to improve Bug coverage