Thanks to @breatheloud for reporting and triaging this! * Improve tests to cover what the instructions actually ask for. * Update solution to pass new test suite.