Propagate Casey's cls library change to src/test.

Signed-off-by: Matt Benjamin <matt@linuxbox.com>