fix on the toString for  clauses, unit test cleanup
most of the functionality is now restored