Continuing to add and updated unit tests.