Fix rendering of object/row types, add failing test