Added todos and renamed test players respectively