Calculator-expressions test improved
Expression-recovery test implemented