add linenumber awareness; improve test parser
Merge branch 'linenumbers'