Dealing with arguments is already fixed
Breakpoint improvements:

- Fixed tests
- More consistent basename behaviour