Fix handling of magic parsing
Fix handling of help suffix
Add a few more test cases.