Updated test suite to complete coverage