Fixes in tests and improvements in converter