fix some more test stuff