Adding tests for full coverage