Added more tests

Also messed with the player to add an id for testing purposes.