Merge "@covers tags for unit tests"