Added a bit more tests and fix unbound reqursion