Formula Tests and fixes