SJ -  updated tests to work with travis