+more tests for full coverage