Fixed unit tests in saas branch