Fixing remove player bug; adding/cleaning up tests