Added more Unit tests.