Fix tests
CheckStyle - Service and update cache keys
CheckStyle - Converters
CheckStyle - Validators
CheckStyle - Converters