Adding more tests, still in recursive hell