Improved test and fixed a lifting error for clauses.
Removed unused field.