moving formula tests, all other unit tests pass
starting to fix formulas