fix some further tests