fixing up routing/delete handling a bit more
fixing up tests, esp for broken types