Added tests for 100% coverage