SJ -  updated tests