Rm simple_diffusion test, fix race condition (#4144)