ADDED several unit tests to try to get to 100% code coverage - made it to 99%.