some more fixes in convert
fixes in tests for the new API format