Added more tests for full coverage