Changed to expect_match where possible
Added show_missing_digits option