add remaining unit tests.