Added tests to increase coverage from 70% to 85%