fixed some formula tests, added more