fixing some additional tests

fixing some other tests