Add tests for full coverage