improved testsuite
made parsing more robust