Added back some old tests and removed som faulty recursion tests.