Other changes include: - add mocks for failing tests Signed-off-by: KiruthikaJeyashankar <kiruthikavjshankar@gmail.com>