Merge "Address missing files in junit tests"