Editing tests
Passing 65/79, still working on fixing functions