Update li handling a bit, and make the expected test results be what we'd