Getting closer to working formulas

For a better unit test