added formulas, some name corrections to both formulas and tests
trying to merge