SJ -  refactored tests