Better use of the END clause in the squid unit tests