Update tests and a few formulas