YJ- changes (removed tests folder)