progress on tests toward #232