Tests: Update unexpected and use some new features to make the expects even shorter.