Merge "Add test for missing code covereage"