Thanks! Fixed, including an expanded test.