Updated version of clunit.h