added Kris's tests