Parsing improved: uses @. Testcase fixes, additions, improvements.