Remove tests carried over from EDD