tidy up clustered standard error module (and make both tests run)