UPDATED unit tests.