fix tests 5
some fixes