Merge "Renaming Kotlin tests according to style guide" into main