upgrade some tests

upgrade some tests so they can ran more stable