Added more EMD tests - takes a couple minutes to run