Add more tests to increase coverage - I