Added more unit tests for services