Dining and fixing tests

Some tests from iterRequest are not passing due to an infinite loop, still needs to be fixed before merge.