Work on test stability