Improve some medium tests