More tests.  Added expected parameters back for publics.