Provide a bit more (complex) example code.
Move tests closer to source.
Fix function names.
Detect declarations (variable and functions), requires fixed esrefactor.