YJ- customizing tests