IM** - adjust tests, clean router