Adding back some removed tests