Fixed failing tests because they do not always run in order.