First part of making tests stable.