Added mine and jackie's tests