Added more related items in the related unit tests.
"Cleaned up" code.