New tests, moved general tests, fixed inbranch-inwhile bug, wrote retry grammar