More tests for full coverage