#268 progress with test alignment