moved junit to own path
moved PvP checks to own class