fix up comment in unary, fix up delete-tests
Adding having clause and tests