Fixes to BullyText and ds-routing tests
- But it's messy. Please, clean up my mess.