Fixed tests but not only.