Converters and tests refactoring.