Added several test units to increase code coverage.
Fix Eclipse bug 399165