Update tests for new converter