Merge "Fix unit tests and coverage"