added more tests for more complete coverage