Added more tests to improve coverage