change tests to be more stable