Update and split tests, add new converter signatures, fix indentation.