cleanup of formula for rssh and additional test