some minor changes in delait etc
removed integration tests sturdy and flimsy, because they broke at some point and are somewhat unsupported functionality anyway.
misc modifications