Major updates

Updating Player and PlayState for some tests