Don't break binary compat.  Work on some tests