partial impl

rev some tests