Merge "Convert testing classest to Kotlin" into main