bring tests into line with new design