Started modifying for PlayerProxy tests but haven't finished yet.